babl: drop long return from conversion funcs

They are propagated and instructions are spent on that, but their value are
never used. Some conversion functions in base even used the argument passed for
counting down to 0 and return 0 instead, to no ill effect.

Since we do not currently see external babl extensions, we can break extensions
API without bumping the library version, this is even a change where due to
varargs, old extensions will continue working until migrated.

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 6a0a52303d288a1209095155844eebb4abe4145f..b08f835af9bd0bb43f7a78138a14b85f22ef0d80 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -311,16 +311,16 @@ babl_conversion_new (const void *first_arg,
   return babl;
 }
 
-static long
+static void
 babl_conversion_linear_process (BablConversion *conversion,
                                 const void     *source,
                                 void           *destination,
                                 long            n)
 {
-  return conversion->function.linear ((void*)conversion, source, destination, n, conversion->data);
+  conversion->function.linear ((void*)conversion, source, destination, n, conversion->data);
 }
 
-static long
+static void
 babl_conversion_plane_process (BablConversion *conversion,
                                const void     *source,
                                void           *destination,
@@ -328,13 +328,13 @@ babl_conversion_plane_process (BablConversion *conversion,
                                int             dst_pitch,
                                long            n)
 {
-  return conversion->function.plane ((void*)conversion, source, destination,
-                                     src_pitch, dst_pitch,
-                                     n,
-                                     conversion->data);
+  conversion->function.plane ((void*)conversion, source, destination,
+                              src_pitch, dst_pitch,
+                              n,
+                              conversion->data);
 }
 
-static long
+static void
 babl_conversion_planar_process (BablConversion *conversion,
                                 BablImage      *source,
                                 BablImage      *destination,
@@ -350,7 +350,7 @@ babl_conversion_planar_process (BablConversion *conversion,
 
   memcpy (src_data, source->data, sizeof (void *) * source->components);
   memcpy (dst_data, destination->data, sizeof (void *) * destination->components);
-  return conversion->function.planar ((void*)conversion,
+  conversion->function.planar ((void*)conversion,
                                       source->components,
                                       src_data,
                                       source->pitch,

diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index ac7ade6d446dcb40598e81767a912ceb2f08aeb5..1f8f8ab90d6bbf0cc3587934fae7bd8a439ee50b 100644 (file)
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -29,13 +29,13 @@ typedef struct _BablConversion BablConversion;
 /* Signature of functions registered for reference type
  * conversions,
  */
-typedef long (*BablFuncPlane)     (BablConversion *conversion,
-                                   const char     *src,
-                                   char           *dst,
-                                   int             src_pitch,
-                                   int             dst_pitch,
-                                   long            n,
-                                   void           *user_data);
+typedef void (*BablFuncPlane) (BablConversion *conversion,
+                               const char     *src,
+                               char           *dst,
+                               int             src_pitch,
+                               int             dst_pitch,
+                               long            n,
+                               void           *user_data);
 
 struct
 _BablConversion {

diff --git a/babl/babl-palette.c b/babl/babl-palette.c
index 7284d6be902eb249157ccdb3481a8d43a036a1bb..f8c7fa8492fb7dd04db21a2fe784c1b7f50943c9 100644 (file)
--- a/babl/babl-palette.c
+++ b/babl/babl-palette.c
@@ -176,7 +176,7 @@ static BablPalette *default_palette (void)
   return &pal;
 }
 
-static long
+static void
 rgba_to_pal (Babl *conversion,
              char *src,
              char *dst,
@@ -215,10 +215,9 @@ rgba_to_pal (Babl *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 1;
     }
-  return n;
 }
 
-static long
+static void
 rgba_to_pala (Babl *conversion,
               char *src,
               char *dst,
@@ -262,10 +261,9 @@ rgba_to_pala (Babl *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 2;
     }
-  return n;
 }
 
-static long
+static void
 pal_to_rgba (Babl *conversion,
              char *src,
              char *dst,
@@ -289,10 +287,9 @@ pal_to_rgba (Babl *conversion,
       src += sizeof (double) * 1;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
-static long
+static void
 pala_to_rgba (Babl *conversion,
               char *src,
               char *dst,
@@ -320,10 +317,9 @@ pala_to_rgba (Babl *conversion,
       src += sizeof (double) * 2;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
-static long
+static void
 rgba_u8_to_pal (Babl          *conversion,
                 unsigned char *src,
                 unsigned char *dst,
@@ -342,11 +338,9 @@ rgba_u8_to_pal (Babl          *conversion,
       src += sizeof (char) * 4;
       dst += sizeof (char) * 1;
     }
-
-  return n;
 }
 
-static long
+static void
 rgba_u8_to_pal_a (Babl *conversion,
                   char *src,
                   char *dst,
@@ -366,7 +360,6 @@ rgba_u8_to_pal_a (Babl *conversion,
       src += sizeof (char) * 4;
       dst += sizeof (char) * 2;
     }
-  return n;
 }
 
 static long

diff --git a/babl/babl-space.c b/babl/babl-space.c
index 40a21c94e7a04f15c943c275dbc0f60385ce6d22..3f0812ba92377a8d7b3b9ade1609289fa138f41b 100644 (file)
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -472,7 +472,7 @@ static void prep_conversion (const Babl *babl)
 
 
 
-static inline long
+static inline void
 universal_nonlinear_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
@@ -487,11 +487,9 @@ universal_nonlinear_rgb_converter (const Babl *conversion,unsigned char *src_cha
   babl_matrix_mul_vectorff_buf4 (matrixf, rgba_out, rgba_out, samples);
 
   TRC_OUT(rgba_out, rgba_out);
-
-  return samples;
 }
 
-static inline long
+static inline void
 universal_nonlinear_rgb_linear_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
@@ -502,11 +500,9 @@ universal_nonlinear_rgb_linear_converter (const Babl *conversion,unsigned char *
   TRC_IN(rgba_in, rgba_out);
 
   babl_matrix_mul_vectorff_buf4 (matrixf, rgba_out, rgba_out, samples);
-
-  return samples;
 }
 
-static inline long
+static inline void
 universal_nonlinear_rgba_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *destination_space = conversion->conversion.destination->format.space;
@@ -541,12 +537,10 @@ universal_nonlinear_rgba_u8_converter (const Babl *conversion,unsigned char *src
     }
   }
   babl_free (rgb);
-
-  return samples;
 }
 
 
-static inline long
+static inline void
 universal_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   float *matrixf = conversion->conversion.data;
@@ -554,11 +548,9 @@ universal_rgba_converter (const Babl *conversion,unsigned char *src_char, unsign
   float *rgba_out = (void*)dst_char;
 
   babl_matrix_mul_vectorff_buf4 (matrixf, rgba_in, rgba_out, samples);
-
-  return samples;
 }
 
-static inline long
+static inline void
 universal_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   float *matrixf = conversion->conversion.data;
@@ -566,12 +558,10 @@ universal_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigne
   float *rgb_out = (void*)dst_char;
 
   babl_matrix_mul_vectorff_buf3 (matrixf, rgb_in, rgb_out, samples);
-
-  return samples;
 }
 
 
-static inline long
+static inline void
 universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *destination_space = conversion->conversion.destination->format.space;
@@ -603,8 +593,6 @@ universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_
   }
 
   babl_free (rgba_out);
-
-  return samples;
 }
 
 
@@ -639,7 +627,7 @@ static inline void babl_matrix_mul_vectorff_buf4_sse2 (const float *mat,
 #undef m
 
 
-static inline long
+static inline void
 universal_nonlinear_rgb_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
@@ -653,12 +641,10 @@ universal_nonlinear_rgb_converter_sse2 (const Babl *conversion,unsigned char *sr
   babl_matrix_mul_vectorff_buf4_sse2 (matrixf, rgba_out, rgba_out, samples);
 
   TRC_OUT(rgba_out, rgba_out);
-
-  return samples;
 }
 
 
-static inline long
+static inline void
 universal_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   float *matrixf = conversion->conversion.data;
@@ -666,11 +652,9 @@ universal_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, u
   float *rgba_out = (void*)dst_char;
 
   babl_matrix_mul_vectorff_buf4_sse2 (matrixf, rgba_in, rgba_out, samples);
-
-  return samples;
 }
 
-static inline long
+static inline void
 universal_nonlinear_rgba_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *destination_space = conversion->conversion.destination->format.space;
@@ -703,11 +687,9 @@ universal_nonlinear_rgba_u8_converter_sse2 (const Babl *conversion,unsigned char
   }
 
   babl_free (rgba_out);
-
-  return samples;
 }
 
-static inline long
+static inline void
 universal_nonlinear_rgb_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *destination_space = conversion->conversion.destination->format.space;
@@ -739,12 +721,10 @@ universal_nonlinear_rgb_u8_converter_sse2 (const Babl *conversion,unsigned char
   }
 
   babl_free (rgba_out);
-
-  return samples;
 }
 
 
-static inline long
+static inline void
 universal_nonlinear_rgb_linear_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
@@ -755,8 +735,6 @@ universal_nonlinear_rgb_linear_converter_sse2 (const Babl *conversion,unsigned c
   TRC_IN(rgba_in, rgba_out);
 
   babl_matrix_mul_vectorff_buf4_sse2 (matrixf, rgba_out, rgba_out, samples);
-
-  return samples;
 }
 #endif
 

diff --git a/babl/babl-types.h b/babl/babl-types.h
index e4e5a8575c95a7e96f9a1e7ffc8516a3788da2d2..c1c4c2767131a693b377a076faeb382942964577 100644 (file)
--- a/babl/babl-types.h
+++ b/babl/babl-types.h
@@ -37,14 +37,14 @@ typedef union _Babl Babl;
 /* Conversion function between linear data of a either a data types or
  * color formats.
  */
-typedef long (*BablFuncLinear)    (const Babl *conversion,
+typedef void (*BablFuncLinear)    (const Babl *conversion,
                                    const char  *src,
                                    char  *dst,
                                    long   n,
                                    void  *user_data);
 
 /* TypePlanar,ModelPlanar and FormatPlanar */
-typedef long (*BablFuncPlanar)    (const Babl *conversion,
+typedef void (*BablFuncPlanar)    (const Babl *conversion,
                                    int    src_bands,
                                    const char  *src[],
                                    int    src_pitch[],

diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c
index adb9fd8ed396495b0ec303a6df72b36f7df871f7..d2cf0607805c1294661bd0d1072a91d3a9f34753 100644 (file)
--- a/babl/base/model-gray.c
+++ b/babl/base/model-gray.c
@@ -107,7 +107,7 @@ models (void)
 }
 
 
-static long
+static void
 rgba_to_graya (Babl *conversion,
                char *src,
                char *dst,
@@ -138,10 +138,9 @@ rgba_to_graya (Babl *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 2;
     }
-  return n;
 }
 
-static long
+static void
 rgba_to_gray (Babl *conversion,
               char *src,
               char *dst,
@@ -170,10 +169,9 @@ rgba_to_gray (Babl *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 1;
     }
-  return n;
 }
 
-static long
+static void
 rgb_to_gray_2_2 (Babl  *conversion,
                  int    src_bands,
                  char **src,
@@ -213,11 +211,10 @@ rgb_to_gray_2_2 (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
 
-static long
+static void
 gray_2_2_to_rgb (Babl *conversion,
                  int    src_bands,
                  char **src,
@@ -255,12 +252,9 @@ gray_2_2_to_rgb (Babl *conversion,
 
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
-
-
-static long
+static void
 graya_to_rgba (Babl *conversion,
                char *src,
                char *dst,
@@ -286,11 +280,10 @@ graya_to_rgba (Babl *conversion,
       src += sizeof (double) * 2;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
 
-static long
+static void
 gray_to_rgba (Babl *conversion,
               char *src,
               char *dst,
@@ -314,10 +307,9 @@ gray_to_rgba (Babl *conversion,
       src += sizeof (double) * 1;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
-static long
+static void
 gray_alpha_premultiplied_to_rgba (Babl   *conversion,
                                   int    src_bands,
                                   char **src,
@@ -351,11 +343,10 @@ gray_alpha_premultiplied_to_rgba (Babl   *conversion,
       *(double *) dst[3] = alpha;
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
 
-static long
+static void
 rgba_to_gray_alpha_premultiplied (Babl   *conversion,
                                   int    src_bands,
                                   char **src,
@@ -392,10 +383,9 @@ rgba_to_gray_alpha_premultiplied (Babl   *conversion,
       *(double *) dst[1] = alpha;
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
-static long
+static void
 non_premultiplied_to_premultiplied (Babl  *conversion,
                                     int    src_bands,
                                     char **src,
@@ -421,10 +411,9 @@ non_premultiplied_to_premultiplied (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
-static long
+static void
 premultiplied_to_non_premultiplied (Babl  *conversion,
                                     int    src_bands,
                                     char **src,
@@ -457,10 +446,9 @@ premultiplied_to_non_premultiplied (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return n;
 }
 
-static long
+static void
 rgba2gray_gamma_2_2_premultiplied (Babl *conversion,
                                    char *src,
                                    char *dst,
@@ -493,11 +481,10 @@ rgba2gray_gamma_2_2_premultiplied (Babl *conversion,
       src += 4 * sizeof (double);
       dst += 2 * sizeof (double);
     }
-  return n;
 }
 
 
-static long
+static void
 gray_gamma_2_2_premultiplied2rgba (Babl *conversion,
                                    char *src,
                                    char *dst,
@@ -523,7 +510,6 @@ gray_gamma_2_2_premultiplied2rgba (Babl *conversion,
       src += 2 * sizeof (double);
       dst += 4 * sizeof (double);
     }
-  return n;
 }
 
 

diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c
index 4fcd2fb0618765efd362bf8fc994d690cd88cdce..7da204f4b5af6517825f31bbbf8fb3759f95c0f7 100644 (file)
--- a/babl/base/model-rgb.c
+++ b/babl/base/model-rgb.c
@@ -149,7 +149,7 @@ models (void)
     NULL);
 }
 
-static long
+static void
 copy_strip_1 (Babl  *conversion,
               int    src_bands,
               char **src,
@@ -178,10 +178,9 @@ copy_strip_1 (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return samples;
 }
 
-static long
+static void
 g3_gamma_2_2 (Babl  *conversion,
               int    src_bands,
               char **src,
@@ -207,11 +206,10 @@ g3_gamma_2_2 (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return samples;
 }
 
 
-static long
+static void
 g3_inv_gamma_2_2 (Babl  *conversion,
                   int    src_bands,
                   char **src,
@@ -242,10 +240,9 @@ g3_inv_gamma_2_2 (Babl  *conversion,
         }
       BABL_PLANAR_STEP
     }
-  return samples;
 }
 
-static long
+static void
 non_premultiplied_to_premultiplied (Babl  *conversion,
                                     int    src_bands,
                                     char **src,
@@ -272,10 +269,9 @@ non_premultiplied_to_premultiplied (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return samples;
 }
 
-static long
+static void
 premultiplied_to_non_premultiplied (Babl  *conversion,
                                     int    src_bands,
                                     char **src,
@@ -309,12 +305,10 @@ premultiplied_to_non_premultiplied (Babl  *conversion,
 
       BABL_PLANAR_STEP
     }
-  return samples;
 }
 
 
-
-static long
+static void
 rgba2rgba_gamma_2_2_premultiplied (Babl *conversion,
                                    char *src,
                                    char *dst,
@@ -334,11 +328,10 @@ rgba2rgba_gamma_2_2_premultiplied (Babl *conversion,
       src                += 4 * sizeof (double);
       dst                += 4 * sizeof (double);
     }
-  return samples;
 }
 
 
-static long
+static void
 rgba_gamma_2_2_premultiplied2rgba (Babl *conversion,
                                    char           *src,
                                    char           *dst,
@@ -368,11 +361,10 @@ rgba_gamma_2_2_premultiplied2rgba (Babl *conversion,
       src += 4 * sizeof (double);
       dst += 4 * sizeof (double);
     }
-  return samples;
 }
 
 
-static long
+static void
 rgba2rgba_gamma_2_2 (Babl *conversion,
                      char *src,
                      char *dst,
@@ -392,11 +384,10 @@ rgba2rgba_gamma_2_2 (Babl *conversion,
       src                += 4 * sizeof (double);
       dst                += 4 * sizeof (double);
     }
-  return samples;
 }
 
 
-static long
+static void
 rgba_gamma_2_22rgba (Babl *conversion,
                      char *src,
                      char *dst,
@@ -417,7 +408,6 @@ rgba_gamma_2_22rgba (Babl *conversion,
       src += 4 * sizeof (double);
       dst += 4 * sizeof (double);
     }
-  return samples;
 }
 
 static void

diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c
index c6de014379149c182a1c9942db5be368c748d2cc..6b34d20b54222bc20b9ea5a38b417c6fe5bc089f 100644 (file)
--- a/babl/base/model-ycbcr.c
+++ b/babl/base/model-ycbcr.c
@@ -77,7 +77,7 @@ models (void)
     NULL);
 }
 
-static long
+static void
 rgba_to_ycbcra (BablConversion *conversion,
                 char *src,
                 char *dst,
@@ -108,11 +108,10 @@ rgba_to_ycbcra (BablConversion *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
 
-static long
+static void
 rgba_to_ycbcr (BablConversion *conversion,
                char *src,
                char *dst,
@@ -141,10 +140,9 @@ rgba_to_ycbcr (BablConversion *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 3;
     }
-  return n;
 }
 
-static long
+static void
 ycbcra_to_rgba (BablConversion *conversion,
                 char *src,
                 char *dst,
@@ -175,11 +173,9 @@ ycbcra_to_rgba (BablConversion *conversion,
       src += sizeof (double) * 4;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
-
-static long
+static void
 ycbcr_to_rgba (BablConversion *conversion,
                char *src,
                char *dst,
@@ -209,7 +205,6 @@ ycbcr_to_rgba (BablConversion *conversion,
       src += sizeof (double) * 3;
       dst += sizeof (double) * 4;
     }
-  return n;
 }
 
 static void

diff --git a/babl/base/type-float.c b/babl/base/type-float.c
index 8c620218d0f3c603205a907e52d1089e47069f23..709c7fa13b180b7936c47fdc2e523465ce1a6448 100644 (file)
--- a/babl/base/type-float.c
+++ b/babl/base/type-float.c
@@ -25,7 +25,7 @@
 #include "babl-ids.h"
 #include "babl-base.h"
 
-static long
+static void
 convert_double_float (BablConversion *conversion,
                       char *src,
                       char *dst,
@@ -39,10 +39,9 @@ convert_double_float (BablConversion *conversion,
       dst             += dst_pitch;
       src             += src_pitch;
     }
-  return n;
 }
 
-static long
+static void
 convert_float_double (BablConversion *conversion,
                       char *src,
                       char *dst,
@@ -56,7 +55,6 @@ convert_float_double (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
 void

diff --git a/babl/base/type-half.c b/babl/base/type-half.c
index 64fd15d253ef98af9dba80216f4fbdb1ddc71435..93d5e5bdaeb67ef9ae76c4452a105d6e48a1c585 100644 (file)
--- a/babl/base/type-half.c
+++ b/babl/base/type-half.c
@@ -183,7 +183,7 @@ static void halfp2doubles(void *target, void *source, long numel)
     }
 }
 
-static long
+static void
 convert_double_half (BablConversion *conversion,
                      char *src,
                      char *dst,
@@ -197,10 +197,9 @@ convert_double_half (BablConversion *conversion,
       dst             += dst_pitch;
       src             += src_pitch;
     }
-  return n;
 }
 
-static long
+static void
 convert_half_double (BablConversion *conversion,
                      char *src,
                      char *dst,
@@ -214,7 +213,6 @@ convert_half_double (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
 void

diff --git a/babl/base/type-u15.c b/babl/base/type-u15.c
index ee188e8b201907ae995c78935d9964b8e9d52d27..355f87581650a685bd2c974d97a8f3ca2e7c4bcd 100644 (file)
--- a/babl/base/type-u15.c
+++ b/babl/base/type-u15.c
@@ -26,7 +26,7 @@
 #include "babl-base.h"
 
 
-static inline long
+static inline void
 convert_double_u15_scaled (BablConversion *conversion,
                            double          min_val,
                            double          max_val,
@@ -54,10 +54,9 @@ convert_double_u15_scaled (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
-static inline long
+static inline void
 convert_u15_double_scaled (BablConversion *conversion,
                            double          min_val,
                            double          max_val,
@@ -85,11 +84,10 @@ convert_u15_double_scaled (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
-  static long \
+  static void \
   convert_ ## name ## _double (BablConversion *conversion, \
                                void *src, \
                                void *dst, \
@@ -97,18 +95,18 @@ convert_u15_double_scaled (BablConversion *conversion,
                                int dst_pitch, \
                                long n)                               \
   { \
-    return convert_u15_double_scaled (conversion, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_u15_double_scaled (conversion, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }                                                               \
-  static long \
+  static void \
   convert_double_ ## name (BablConversion *conversion, void *src, \
                            void *dst, \
                            int src_pitch, \
                            int dst_pitch, \
                            long n)                                 \
   { \
-    return convert_double_u15_scaled (conversion, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_double_u15_scaled (conversion, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }
 
 MAKE_CONVERSIONS (u15, 0.0, 1.0, 0, (1<<15))

diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c
index 697f1dac5f056d362ce3a243e0b032f18a5ef482..4a7c8f10fc0c1c79b065568af24d312e69d15372 100644 (file)
--- a/babl/base/type-u16.c
+++ b/babl/base/type-u16.c
@@ -26,7 +26,7 @@
 #include "babl-base.h"
 
 
-static inline long
+static inline void
 convert_double_u16_scaled (BablConversion *conversion,
                            double   min_val,
                            double   max_val,
@@ -54,10 +54,9 @@ convert_double_u16_scaled (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
-static inline long
+static inline void
 convert_u16_double_scaled (BablConversion *conversion,
                            double   min_val,
                            double   max_val,
@@ -85,29 +84,28 @@ convert_u16_double_scaled (BablConversion *conversion,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
-  static long \
+  static void \
   convert_ ## name ## _double (BablConversion *c, void *src, \
                                void *dst, \
                                int src_pitch, \
                                int dst_pitch, \
                                long n)                               \
   { \
-    return convert_u16_double_scaled (c, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_u16_double_scaled (c, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }                                                               \
-  static long \
+  static void \
   convert_double_ ## name (BablConversion *c, void *src, \
                            void *dst, \
                            int src_pitch, \
                            int dst_pitch, \
                            long n)                                 \
   { \
-    return convert_double_u16_scaled (c, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_double_u16_scaled (c, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }
 
 MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX)

diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c
index b934dbe55ef17faa6bc14b0e3f1624dc81d4d2db..66a56548fc29e6e5268ff324accc906a54071cac 100644 (file)
--- a/babl/base/type-u32.c
+++ b/babl/base/type-u32.c
@@ -25,7 +25,7 @@
 #include "babl-internal.h"
 #include "babl-base.h"
 
-static inline long
+static inline void
 convert_double_u32_scaled (BablConversion *c,
                            double   min_val,
                            double   max_val,
@@ -53,10 +53,9 @@ convert_double_u32_scaled (BablConversion *c,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
-static inline long
+static inline void
 convert_u32_double_scaled (BablConversion *c,
                            double   min_val,
                            double   max_val,
@@ -84,29 +83,28 @@ convert_u32_double_scaled (BablConversion *c,
       dst              += dst_pitch;
       src              += src_pitch;
     }
-  return n;
 }
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
-  static long \
+  static void \
   convert_ ## name ## _double (BablConversion *c, void *src, \
                                void *dst, \
                                int src_pitch, \
                                int dst_pitch, \
                                long n)                               \
   { \
-    return convert_u32_double_scaled (c, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_u32_double_scaled (c, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }                                                               \
-  static long \
+  static void \
   convert_double_ ## name (BablConversion *c, void *src, \
                            void *dst, \
                            int src_pitch, \
                            int dst_pitch, \
                            long n)                                 \
   { \
-    return convert_double_u32_scaled (c, min_val, max_val, min, max, \
-                                      src, dst, src_pitch, dst_pitch, n); \
+    convert_double_u32_scaled (c, min_val, max_val, min, max, \
+                               src, dst, src_pitch, dst_pitch, n); \
   }
 
 MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX)

diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c
index 86d889e6246d93bbcfa054856cb5006586af8ced..8eeaf65347bdb4f8f17cb6f9ec6f03751f122b7b 100644 (file)
--- a/babl/base/type-u8.c
+++ b/babl/base/type-u8.c
@@ -25,7 +25,7 @@
 #include "babl-base.h"
 
 #include <math.h>
-static inline long
+static inline void
 convert_double_u8_scaled (BablConversion *c,
                           double        min_val,
                           double        max_val,
@@ -53,10 +53,9 @@ convert_double_u8_scaled (BablConversion *c,
       src                   += src_pitch;
       dst                   += dst_pitch;
     }
-  return n;
 }
 
-static inline long
+static inline void
 convert_u8_double_scaled (BablConversion *c,
                           double        min_val,
                           double        max_val,
@@ -85,29 +84,28 @@ convert_u8_double_scaled (BablConversion *c,
       dst += dst_pitch;
       src += src_pitch;
     }
-  return n;
 }
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
-  static long \
+  static void \
   convert_ ## name ## _double (BablConversion *c, void *src, \
                                void *dst, \
                                int src_pitch, \
                                int dst_pitch, \
                                long n)                               \
   { \
-    return convert_u8_double_scaled (c, min_val, max_val, min, max, \
-                                     src, dst, src_pitch, dst_pitch, n); \
+    convert_u8_double_scaled (c, min_val, max_val, min, max, \
+                              src, dst, src_pitch, dst_pitch, n); \
   }                                                               \
-  static long \
+  static void \
   convert_double_ ## name (BablConversion *c, void *src, \
                            void *dst, \
                            int src_pitch, \
                            int dst_pitch, \
                            long n)                                 \
   { \
-    return convert_double_u8_scaled (c, min_val, max_val, min, max, \
-                                     src, dst, src_pitch, dst_pitch, n); \
+    convert_double_u8_scaled (c, min_val, max_val, min, max, \
+                              src, dst, src_pitch, dst_pitch, n); \
   }
 
 MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX)